Run Emerge on two files." (byte-code "└\n├─└ë╞%ë├╟└ ╞%\n¡ê├╔\n ë└%F)ç" [nil f current-prefix-arg emerge-read-file-name "File A to merge" emerge-last-dir-A confirm "File B to merge" emerge-last-dir-B "Output file" emerge-last-dir-output] 9)])
Run Emerge on two files, giving another file as the ancestor." (byte-code "└\n├─└ë╞%ë├╟└ ╞%├╔\n└ ╞%\n¡ê├╦ ë└%»)ç" [nil f current-prefix-arg emerge-read-file-name "File A to merge" emerge-last-dir-A confirm "File B to merge" emerge-last-dir-B "Ancestor file" emerge-last-dir-ancestor "Output file" emerge-last-dir-output] 10)])
Emerge two RCS revisions of a file." (byte-code "┴┬├ë─$┼╞\"┼╚ \"Fç" [current-prefix-arg read-file-name "File to merge: " nil confirm read-string "Revision A to merge: " emerge-last-revision-A "Revision B to merge: " emerge-last-revision-B] 6)])
(fset 'emerge-execute-line #[nil "└ëëë┴ m½ä╟╚!ê╔yê╩╦!½ä╔òbêl¼√╩╠!½≡═ö═ò{ù╬ö╬ò{ ╔òbê╤ÿ½Ä½ä╟╥!ê¬╞╙ÿ½î½ä╟╘!ê¬┤╒ÿ¼å╓ÿ½î ½ä╟╫!ꬣ╪ÿ¼å┘ÿ½î ½ä╟┌!ê¬ä╟█!ê*¬╟▄!ꬽâ¼ç ¼ä╟▌!ê¼ç¼ä╟▐!ê═yê½ú½á ½¥▀α#êß ?? └Γ└πpDΣFC&¬╟½ƒ½£▀α#êσ ?? └Γ└πpDµFC&¬ñ ½ë'½à▀Φ!¬ÿ«ü )▀Ω!êδ) \"ê▀∞) #)-ç" [nil t case-fold-search file-out file-ancestor file-B file-A error "At end of buffer" 0 looking-at "[ ]*" "\\([a-z]+\\)=\\([^ \n]+\\)[ ]*" 1 2 file tag "a" "This line has two 'A' entries" "b" "This line has two 'B' entries" "anc" "ancestor" "This line has two 'ancestor' entries" "out" "output" "This line has two 'output' entries" "Unrecognized entry" "Unparseable entry" "Must have both 'A' and 'B' entries" "Must have 'A' or 'B' entry" message "Merging %s and %s..." emerge-files-with-ancestor lambda switch-to-buffer (message "Merge done") emerge-files (message "Merge done") emerge-execute-line-deletions "No action" input-file "Copying..." copy-file "%s copied to %s"] 11 "\
Process the current line, looking for entries of the form:
a=file1
b=file2
ancestor=file3
output=file4
seperated by whitespace. Based on entries found, call emerge correctly
on the files files listed.
In addition, if only one of \"a=file\" or \"b=file\" is present, and \"output=file\"
is present:
If emerge-execute-line-deletions is non-nil and \"ancestor=file\" is present,
it is assumed that the file in question has been deleted, and it is
not copied to the output file.
Otherwise, the A or B file present is copied to the output file." nil])
(fset 'emerge-set-merge-mode #[(mode) "└┴!¼ç\n¼ä├─!ê ê╞ ê½â╟ ç╚ ç" [featurep kill-fix emerge-lucid-p error "You must have kill-fix.el loaded to use emerge-set-merge-mode!" mode emerge-refresh-mode-line emerge-fast-mode emerge-edit-mode] 2 "\
Set the major mode in a merge buffer. Overrides any change that the mode
might make to the mode line or local keymap. Leaves merge in fast mode.
Requires kill-fix.el or Lucid Emacs to work." (byte-code "└┴┬ ─┼╞%!Cç" [intern completing-read "New major mode for merge buffer (function name): " obarray commandp t nil] 7)])
